Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 7 Nov 2011 17:55:45 +0000 (09:55 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 7 Nov 2011 17:55:45 +0000 (09:55 -0800)
commitf5198b38ffdc6b7a9cd7c87af56e164549046a95
treed93ada870a0116b42b577ddc767b2046ede34e5a
parent8e97e47f53dbdcf700b8467e04d42f087b90d5ce
parentf76f5dabb7312deebdd3c32d886f557828627706
Merge from trunk.